Cast pointers to guintptr, not unsigned long, before doing bit tests on

2008-08-05  Tor Lillqvist  <tml@novell.com>

	* gdk/gdkrgb.c: Cast pointers to guintptr, not unsigned long,
	before doing bit tests on them.

svn path=/trunk/; revision=20987

diff --git a/ChangeLog b/ChangeLog
index 61f46bac5fbde02a8d3b8a34bb523e61b7b77db3..d97d8de73b14073cf86f8d9d8731514719a99145 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-05  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/gdkrgb.c: Cast pointers to guintptr, not unsigned long,
+       before doing bit tests on them.
+
 2008-08-05  Tor Lillqvist  <tml@novell.com>
 
        * configure.in: Define GDK_NATIVE_WINDOW_POINTER on 32-bit

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index cb138636ed369686ce58d86c788acf277ec1d88e..9b6a1b11f20c7e568bd33a28f8c70a8fad7f0d59 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -862,7 +862,7 @@ gdk_rgb_convert_8 (GdkRgbInfo *image_info, GdkImage *image,
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
        {
          for (x = 0; x < width; x++)
            {
@@ -1495,7 +1495,7 @@ gdk_rgb_convert_565 (GdkRgbInfo *image_info, GdkImage *image,
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
        {
          for (x = 0; x < width; x++)
            {
@@ -1626,7 +1626,7 @@ gdk_rgb_convert_565_gray (GdkRgbInfo *image_info, GdkImage *image,
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
        {
          for (x = 0; x < width; x++)
            {
@@ -1768,7 +1768,7 @@ gdk_rgb_convert_565_d (GdkRgbInfo *image_info, GdkImage *image,
       const guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT);
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
        {
          for (x = x_align; x < width; x++)
            {
@@ -2030,7 +2030,7 @@ gdk_rgb_convert_888_lsb (GdkRgbInfo *image_info, GdkImage *image,
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
        {
          for (x = 0; x < width; x++)
            {